Diff/Merge tool

Introduction
The Diff/Merge tool allows you to show and merge differences between files and versions of files. The Diff/Merge tool offers two- or three-way differences. Three-way differences are important for investigating changes made by two developers to the same file. In such a case you want to look at the two file versions compared to a common ancestor.
The following illustration shows the Diff/Merge tool displaying the differences between two versions of a file:

The Diff/Merge tool can also be used for editing files. However, we suggest using the Source Editor for editing, as it supports many more editing features than the Diff/Merge tool.